Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Remove plugins from export set (backport #3227) #3241

Closed
wants to merge 11 commits into from

Conversation

mergify[bot]
Copy link

@mergify mergify bot commented Jan 13, 2025

Description

Plugins that are intended to be loaded by classloader or pluginlib should not be in export sets that ament_export_targets is called on. This can cause plugins to fail to load.


This is an automatic backport of pull request #3227 done by Mergify.

* Remove plugins from export set

Signed-off-by: Paul Gesel <paul.gesel@picknik.ai>

* move more plugins to different export set

Signed-off-by: Paul Gesel <paul.gesel@picknik.ai>

* run pre-commit

Signed-off-by: Paul Gesel <paul.gesel@picknik.ai>

* remove plugins from moveit_kinematics export

Signed-off-by: Paul Gesel <paul.gesel@picknik.ai>

* do not link base interface to plugin in kinematics

Signed-off-by: Paul Gesel <paul.gesel@picknik.ai>

---------

Signed-off-by: Paul Gesel <paul.gesel@picknik.ai>
Co-authored-by: Sebastian Jahr <sebastian.jahr@picknik.ai>
(cherry picked from commit b5eb4de)

# Conflicts:
#	moveit_core/CMakeLists.txt
#	moveit_kinematics/CMakeLists.txt
#	moveit_kinematics/cached_ik_kinematics_plugin/CMakeLists.txt
#	moveit_ros/move_group/CMakeLists.txt
@mergify mergify bot added the conflicts label Jan 13, 2025
Copy link
Author

mergify bot commented Jan 13, 2025

Cherry-pick of b5eb4de has failed:

On branch mergify/bp/humble/pr-3227
Your branch is up to date with 'origin/humble'.

You are currently cherry-picking commit b5eb4deb3.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   moveit_core/CMakeLists.txt
	both modified:   moveit_kinematics/CMakeLists.txt
	both modified:   moveit_kinematics/cached_ik_kinematics_plugin/CMakeLists.txt
	both modified:   moveit_ros/move_group/CMakeLists.txt

no changes added to commit (use "git add" and/or "git commit -a")

To fix up this pull request, you can check it out locally. See documentation: https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally

@sea-bass sea-bass requested review from pac48 and sjahr January 13, 2025 23:38
@sea-bass
Copy link
Contributor

@pac48 Would you have time to look at how this PR would be backported to Humble / if it makes sense at all?

Looking to cut a Humble release soon since there have been quite a few bugfixes lately, and it would be good to have this in.

@pac48
Copy link
Contributor

pac48 commented Jan 29, 2025

@sea-bass This change should resolve the conflict #3282

@sea-bass
Copy link
Contributor

sea-bass commented Feb 2, 2025

@pac48 -- thanks for your PR to help with this challenging conflict resolution! I could not have done this myself.

I additionally ended up having to remove some of the libraries that did not exist in Humble, namely moveit_macros, the 2 new acceleration filter/Ruckig smoothing plugins, and anything that used generate_parameter_library -- the only thing on Humble that used this was the Butterworth filter smoothing plugin.

In addition, I had to bring in a few other fixes from main to make linking happy. These were likely fixed at some point after the divergence of humble/main, but never needed to be backported until now.

@sea-bass sea-bass removed the conflicts label Feb 2, 2025
install(
TARGETS
collision_detector_bullet_plugin
collision_detector_fcl_plugin
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

For some reason, collision_detector_fcl_plugin was actually not in the previous list of targets to install -- but it builds fine.

@henningkayser do you maybe know if there was something specific with Humble where we shouldn't be building it?

@codecov-commenter
Copy link

codecov-commenter commented Feb 2, 2025

⚠️ Please install the 'codecov app svg image' to ensure uploads and comments are reliably processed by Codecov.

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 51.40%. Comparing base (166e96a) to head (5206bc6).
Report is 2 commits behind head on humble.

❗ Your organization needs to install the Codecov GitHub app to enable full functionality.

Additional details and impacted files
@@            Coverage Diff             @@
##           humble    #3241      +/-   ##
==========================================
+ Coverage   51.40%   51.40%   +0.01%     
==========================================
  Files         382      384       +2     
  Lines       31899    31904       +5     
==========================================
+ Hits        16394    16398       +4     
- Misses      15505    15506       +1     

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

@sea-bass
Copy link
Contributor

sea-bass commented Feb 3, 2025

If someone knows why the IKfast + clang-tidy checks only are failing consistently on Pilz tests after these changes, would appreciate the help...

@sea-bass sea-bass force-pushed the mergify/bp/humble/pr-3227 branch from 6b698da to d0b5635 Compare February 3, 2025 01:59
@sea-bass sea-bass force-pushed the mergify/bp/humble/pr-3227 branch 2 times, most recently from 2ab36d5 to 788e95d Compare February 4, 2025 03:17
@sjahr
Copy link
Contributor

sjahr commented Feb 4, 2025

I don't see something obvious why PILZ throws ... Should we just disable this test in Humble or just not backport this change?

@sea-bass
Copy link
Contributor

sea-bass commented Feb 4, 2025

I don't see something obvious why PILZ throws ... Should we just disable this test in Humble or just not backport this change?

Leaning towards not backporting this change...

@sea-bass
Copy link
Contributor

sea-bass commented Feb 5, 2025

punting on this effort ✌🏻

@sea-bass sea-bass closed this Feb 5, 2025
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants